tools-console-prefix.diff

Patch-Name: tools-console-prefix.diff

Gbp-Pq: Topic prefix-abiname
Gbp-Pq: Name tools-console-prefix.diff

diff --git a/tools/console/Makefile b/tools/console/Makefile
index 84796eac8f111e8ab3c3d5428223050ac7929569..4b24795ab668aaf9c4f857b8e33d08d6c55706e5 100644 (file)
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -8,6 +8,7 @@ CFLAGS  += $(CFLAGS_libxenstore)
 LDLIBS += $(LDLIBS_libxenctrl)
 LDLIBS += $(LDLIBS_libxenstore)
 LDLIBS += $(SOCKET_LIBS)
+LDFLAGS += $(call LDFLAGS_RPATH,../lib)
 
 LDLIBS_xenconsoled += $(UTIL_LIBS)
 LDLIBS_xenconsoled += -lrt
@@ -45,14 +46,13 @@ $(eval $(genpath-target))
 
 .PHONY: install
 install: $(BIN)
-       $(INSTALL_DIR) $(DESTDIR)/$(sbindir)
-       $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(sbindir)
        $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
        $(INSTALL_PROG) xenconsole $(DESTDIR)$(LIBEXEC_BIN)
+       $(INSTALL_PROG) xenconsoled $(DESTDIR)$(LIBEXEC_BIN)
 
 .PHONY: uninstall
 uninstall:
        rm -f $(DESTDIR)$(LIBEXEC_BIN)/xenconsole
-       rm -f $(DESTDIR)$(sbindir)/xenconsoled
+       rm -f $(DESTDIR)$(LIBEXEC_BIN)/xenconsoled
 
 -include $(DEPS_INCLUDE)